Fixed a lot
Merge remote-tracking branch 'origin/ITSL'

Conflicts:
	AndroidManifest.xml
	res/values/styles.xml
	src/se/mah/kd330a/project/itsl/FeedManager.java
	src/se/mah/kd330a/project/itsl/FragmentITSL.java
	src/se/mah/kd330a/project/itsl/TimeAlarm.java

Need to resolve the conflicts manually
Merge branch 'master' of https://github.com/sandbergnilsvictor/MahAppStudent

Conflicts:
	AndroidManifest.xml
	res/values/styles.xml
	src/se/mah/kd330a/project/itsl/TimeAlarm.java

Need to resolve conflicts manually