profile some details with icons...names...
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
bugs with photo and camera shot...