- extended client-side application logic
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/main.js
Merge remote-tracking branch 'origin/master'
- added javascript magic
- changed index.html so it will be application logic ready
- fixed typos