no changes in sprint log
Merge branch 'master' of https://github.com/sirlordrouter/ch.bfh.btx8081.w2013.green

# By Messerli Vinzenz (1) and vandj2 (1)
# Via Messerli Vinzenz (1) and vandj2 (1)
* 'master' of https://github.com/sirlordrouter/ch.bfh.btx8081.w2013.green:
  new settings view
  Help Setting View added

Conflicts:
	doc/scrum_green.xlsx