first commit
first commit
Merge branch 'master' of https://github.com/ingridoberbuchler/T-Res into ingridoberbuchler-master

Conflicts:
	public/src/app/home/home.js
	public/src/app/home/home.tpl.html
merging with ingrid's home view branche

Conflicts:
	public/src/app/app.js
	public/src/app/home/home.js
	public/src/app/home/home.tpl.html
	public/src/index.html
	routes/tables.js

done