login working
Merge branch 'master' of https://github.com/AndyWarrior/Intramuros

Conflicts:
	app/tmp/cache/persistent/myapp_cake_core_file_map