potato
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/dk/lott/VPPS2015/MainActivity.java
potato