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

...Dlux-master

Conflicts:
css/EmotionSelectionView.css