merged
merged
merged
Merge branch 'master' of
https://github.com/creinbacher/c02_iwi11_ASY_elearning.git

Conflicts:
	MobileRestServiceClient/res/menu/detail.xml
	MobileRestServiceClient/src/at/campus02/asy/DetailActivity.java