Pictos
Merge branch 'master' of https://github.com/alex3165/hackcessangels

Conflicts:
	android/.idea/misc.xml