favicon
Merge branch 'develop' of https://github.com/Phalcon-hosting/phmaster into develop

Conflicts:
	app/views/index.volt
Merge remote-tracking branch 'origin/develop' into develop
Travis test