fsf
fsf
fsf
Merge branch 'master' of https://github.com/mkaczkowski/DRAGON_CAMERA

Conflicts:
	.idea/workspace.xml
	camera-app/_others/_data/images/boom2.png
	camera-app/app/scripts/config.js