git wants me to commit ..
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team2

Conflicts:
	UnisportBern/src/ch/unibe/unisportbern/views/CoursesFragment.java
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team2
minor changes, intent is missing incoursesfragment