Started app design
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/hack/templates/notify.html
Merge pull request #42 from lsxliron/master

Started app design