Merge branch 'master' of /var/www/cc-php-01 with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/index.html
	app/js/application.js
Merge remote-tracking branch 'origin/master'
main styles
Merge remote-tracking branch 'origin/master'
main styles 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/index.html
header