new project setup
R

B
A

Merge branch 'master' into new-menu

Conflicts:
	.idea/compiler.xml
	.idea/workspace.xml
	project.properties
new Backend Service for Sync
changes