modify theme
Merge branch 'master' of https://github.com/AlloVince/phalcon

Conflicts:
	apps/WscnWap/views/layouts/default.phtml