temporary commit
merge upstream/master
fix toolbar icon position
Merge branch 'master' of github.com:DevConMyanmar/devcon-android-2014