sg
Merge branch 'master' of https://github.com/annaptak/mka2.0

Conflicts:
	index.html
zmimany menu
Merge branch 'master' of https://github.com/annaptak/mka2.0
menu
Merge branch 'master' of https://github.com/annaptak/mka2.0

Conflicts:
	scripts/app/views/indexview.js
menu