Changes in titles and buttons
Merge branch 'master' of https://github.com/MyRing/RN-Prototype

Conflicts:
	sapo/templates/avi/avi-00.html