Merge branch 'master' of https://github.com/JDlux/com-doo-dah-app into JDlux-master

Conflicts:
css/EmotionSelectionView.css