move to /public
aa
Merge remote-tracking branch 'origin/zend' into zend

Conflicts:
	public/css/main.css
	public/img/logo.png
	public/img/note.png
	public/img/sticky-note.jpg
	public/index.php
modified composer