changed name to Aware and added GCMInent
Merge branch 'master' of github.com:mauryquijada/aware
Merge branch 'master' of github.com:mauryquijada/aware
Merge branch 'master' of github.com:mauryquijada/aware
settings
merged AndroidManifest conflict