ding
Merge pull request #2 from mlcalvaria/master

ding
spin
Merge pull request #4 from Grimmes/master

spin
commit comment
Revert "commit comment"

This reverts commit a91b5fa5aa76dc01e633d2c83ed164500680dd61.
Revert "Revert "commit comment""

This reverts commit 5b15c000fc698a6e6d386684ce336f574362308d.
comment
Merge pull request #5 from sprottenwels/master

comment
bugfix
new function
console statement
commit changes
add function
Merge branch 'login' of https://github.com/sprottenwels/Sendungserfassung-Admin into login

Conflicts:
	app/partials/advices/adviceCategory.html
	production/advices/style/_advices.scss
	production/app.js
Merge remote-tracking branch 'origin/login' into login
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
Merge pull request #10 from sprottenwels/login

Login