Merge origin/master

Conflicts:
	app/js/services.js
add template
Merge branch 'master' of github.com:jodersky/playGraph into dirty
Merge branch 'ludo' of github.com:jodersky/playGraph into dirty
cleanup after merge
Merge origin/master

Conflicts:
	app/js/services.js