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

Conflicts:
	scripts/m.js
detail
Merge branch 'master' of https://github.com/annaptak/mka2.0

Conflicts:
	scripts/app/collections/sg.js
Merge branch 'master' of https://github.com/annaptak/mka2.0

Conflicts:
	index.html
	scripts/m.js
Merge branch 'master' of https://github.com/annaptak/mka2.0