20131016
Merge branch 'master' of https://github.com/wahav/gnems

Conflicts:
	kendo/index.html
	kendo/js/app.js
	template.html