Dashboard
Merge branch 'master' of https://github.com/XcKoN/QRLocation

Conflicts:
	web/trunk/application/views/frontend/home.php
Dashboard