Merge branch 'master' of /home/f/prog/android/mobileSoft365/KenKen with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	AndroidManifest.xml
	res/values/colors.xml
	src/kenken/com/MainActivity.java
Fragment Choose a Puzzle and Action Bar