Changes to .phtml to test in pagoda.
Merge branch 'master' of github.com:marcoafilho/save-the-princess
Merge branch 'master' of github.com:marcoafilho/save-the-princess

Conflicts:
	app/views/dashboard/index.phtml