to be safe :P
pulled branch 'swati-copy' of git@github.com:zkhan93/SGI_app.git into mergingswati

Conflicts:
	project.properties
nothing
code cleaned, constants organized.. now can continue..
msgs in db
GCM disabled for now
conflict resolved after merge-msg in db
circle image
messeges adapter included
gcm deleted