Update angular coding guidelines
Merge conflict
Syntax
Update README.md
business logic instead of logic
Merge pull request #259 from nens/arjen_update_angular_coding_guidelines

Update angular coding guidelines
jshint
Merge conflict