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

Conflicts:
css/EmotionSelectionView.css
Merge pull request #8 from Caf131/dev-doo-dah-cforehand

Merge branch 'master' of https://github.com/JDlux/com-doo-dah-app into J...
Merge pull request #10 from Caf131/JDlux-master

J dlux master
Merge branch 'dev-doo-dah-cforehand' of https://github.com/Caf131/com-doo-dah-app into dev-doo-dah-cforehand
ActivityService, Updated all navigation links to point to correct files, renamed some files to have .php extension

Need to incorporate sessions
Merge pull request #11 from Caf131/dev-doo-dah-cforehand

Dev doo dah cforehand
Create app-doo-dah.sql

Schema
Create app-doo-dah_moods-prefs

INSERT statements for Moods and User Preferences
Rename app-doo-dah_moods-prefs to app-doo-dah_moods-prefs.sql
Merge pull request #12 from JDlux/master

Add MySQL source code
Changed Home View URL
Merge pull request #13 from Caf131/dev-doo-dah-cforehand

Changed Home View URL
Jeff changes
Merge pull request #14 from Caf131/dev-doo-dah-cforehand

Jeff changes
Create UserPreferencesView.css
Merge pull request #15 from JDlux/master

Create UserPreferencesView.css
Revised Activities, Added new database dump
Merge pull request #16 from Caf131/dev-doo-dah-cforehand

Revised Activities, Added new database dump
SQL updates
Merge pull request #17 from Caf131/dev-doo-dah-cforehand

SQL updates