Ratinv view
photo bc
Merge commit '76b2d1839124a46e8ed2837a348334f302a15dd9' into develop

Conflicts:
	android/.idea/vcs.xml