Merge pull request #321 from Symvaro/develop

add Android user agent
diff --git a/application/config/user_agents.php b/application/config/user_agents.php
index e2d3c3a..4746f2f 100644
--- a/application/config/user_agents.php
+++ b/application/config/user_agents.php
@@ -126,6 +126,7 @@
 					'sendo'				=> "Sendo",
 
 					// Operating Systems
+					'android'				=> "Android",
 					'symbian'				=> "Symbian",
 					'SymbianOS'				=> "SymbianOS",
 					'elaine'				=> "Palm",
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 33e0a62..978b710 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -65,6 +65,7 @@
 <ul>
 	<li>General Changes
 		<ul>
+			<li class="reactor">Added Android to the list of user agents.</li>
 			<li class="reactor">Callback validation rules can now accept parameters like any other validation rule.</li>
 			<li class="reactor">Ability to log certain error types, not all under a threshold.</li>
 			<li class="reactor">Added html_escape() to <a href="general/common_functions.html">Common functions</a> to escape HTML output for preventing XSS.</li>