Main Activity changes
Merge branch 'master' of http://github.com/relh/saladBar