test
-- correcting typos in mysql db creation script
-- testing te front-end abilities
--front-end draft
-- minor db scripts correction
-- pom structure - adding one more parent for front-end
-- pom structure - adding one more parent for front-end
release script
-- shame - removing compiled classes
-- stash merge + pom changes
-- including untracked file
-- minor pom changes for codeguad
-- poms update
-- minor changes to andriod UI
-- shell script for build
-- preparation utilize git flow - all later commits will use git flow
-- cleaning up mess and moving toward maven project structure
-- updated libraries versions
-- clean up and rearrangements of the maven project structure
-- android app cleanup
(cherry picked from commit fc7e1f0)
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	README.md
-- author names in mvn
-- readme cleanup
-- minor changes to the server side
-- release script enhencement
Merge branch 'dev'

Conflicts:
	README.md
	databases/databases.iml
	databases/hadoop/caao-hadoop-db.iml