Icons and main logo on main screen
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/kenken/com/ui/fragments/FragmentSettings.java
Icons and main logo on main screen