Android manifest update
Merge branch 'master' of https://github.com/interactivespaces/interactivespaces
Example fixes for new API