reorganize everything
Merge branch 'master' of github.com:pashasc/booklet

Conflicts:
	js/app.js