First commit of android resource and java source code
Merge remote-tracking branch 'augmentum/master'