A lot of config changes
Merge branch 'master' into IconLove
Upgrade Android to maps v2
Added more pages to the app
Merge pull request #15 from vvidala/IconLove

Final push before the second demo.