-- added restlet dependency - maven
Update README.md
-- added front-end sceleton
Merge branch 'master' of github.com:zafarella/caao
shame - commited binary..
fixing
removing wrong dep
-- pom changes - naming
-- ignoring files
gitignore
Merge branch 'master' into dev

Conflicts:
	.gitignore
	android/caao_android_app/pom.xml
	android/caao_android_appTest/pom.xml
	databases/caao_mysql/caao-mysql-db.iml
	databases/databases.iml
	databases/hadoop/caao-hadoop-db.iml
	pom.xml