Merge from master branch

Created Android Project to start with