Merge pull request #6 from sprottenwels/login

comment
hi to advice
Merge pull request #7 from mlcalvaria/login

hi to advice
transform triangle
Merge pull request #8 from mlcalvaria/login

transform triangle
Merge branch 'login' of https://github.com/RobertMueller/Sendungserfassung-Admin into login

Conflicts:
	app/js/app.js
	app/stylesheets/style.css
	production/advices/adviceCategory.directive.js