merging
Merge branch 'master' of https://github.com/fruktstav/demokratinu

Conflicts:
	demokratinu.src/AndroidManifest.xml