Merge branch 'masterdan'

Conflicts:
	system/admin/admin.php

config/users/username.ini.example

@@ -1,5 +1,9 @@
 ;Password
 password = yourpassword
+encryption = clear
+; encryption: not set, leave blank or set to clear or none to use plain text password for the user,
+; else set to encryption algoritm supported by hash function of php to use the selected
+; encryption
 
 ;Role
-role = admin
+role = admin