Merge remote-tracking branch 'origin/master'

Conflicts:
	TeamCyan/src/main/java/ch/bfh/bti7081/s2013/cyan/view/CyanNavigationToolbar.java
Merge remote-tracking branch 'origin/master'