weird files from Lennart
Merge branch 'master' of https://github.com/maxtile/smap-sekoia-theme-project

Conflicts:
	.idea/libraries/appcompat_v7_19_1_0.xml
	.idea/workspace.xml