No need to edit version code in LoginActivity, is taken from Manifest
now
Others are now displayed
Merge branch 'master' into alcros-dev

Conflicts:
	Vertretungsplan/res/values/strings.xml
Changed launcher icon set
Made changelog fetch from server
Added menu item for changelog
Changed pages to WebView
Made debug-versions show commits after last release
Fixed group Indicator bug
Link is now clickable and updated icon
When only others, this is expanded
Added token authentifikation
Fixed bug by saving tokens correctly
Added logout function
Added notification methods
Added new preferences
Fixed bugs (clear cache and timestamp)
Merge branch 'master' into alcros-dev

Conflicts:
	Vertretungsplan/src/com/inf1315/vertretungsplan/AllAsyncTask.java
Included InfoActivity in Settings
Merge remote-tracking branch 'origin/master'

Conflicts:
	Vertretungsplan/res/layout/preferences.xml
	Vertretungsplan/res/values/strings.xml
	Vertretungsplan/src/com/inf1315/vertretungsplan/LoginActivity.java
	Vertretungsplan/src/com/inf1315/vertretungsplan/PlanActivity.java
	Vertretungsplan/src/com/inf1315/vertretungsplan/SettingsFragment.java