User features
Merge remote-tracking branch 'upstream/master' into info

Conflicts:
	protected/controllers/MapController.php
Still work at users features
Merge pull request #33 from the12chairs/info

Info