.
Merge branch 'master' of https://github.com/mkoertgen/elasticTime

Conflicts:
	js/app.js
	js/bootstrap.js
some progress using angularAMD