Get up-to-date

As of 4-21-14
css
Merge branch 'dev-dohan' of https://github.com/JDlux/com-doo-dah-app into dev-dohan

Conflicts:
GetActivitiesForMood.php
SQL/GetActivitiesForMood.sql
SQL/GetActivityForUser.sql
SQL/InsertMoods.sql
SQL/InsertUserHasMood.sql
SQL/InsertUserHasUserPreferences.sql
SQL/InsertUserPreferences.sql
SQL/databaseDump_04_14_14.sql
SQL/database_dump_04-17-14.sql
SQL/database_dump_04-21-14.sql
UserMoods.php
UserPreferences.php
app-doo-dah.sql
app-doo-dah_moods-prefs.sql
css/ActivityListViewControl.css
css/UserPreferencesView.css
img/sample-images/200px-0_stars.png
img/sample-images/200px-1_stars.png
img/sample-images/200px-2_stars.png
img/sample-images/200px-3_stars.png
img/sample-images/200px-5_stars.png

img/sample-images/512px-Barack_Obama_plays_basketball_with_Arne_Duncan.j
pg
img/sample-images/576px-MoMa_NY_USA_1.jpg
img/sample-images/640px-Book_deckle_01.jpg
img/sample-images/640px-Central_Park_NYC_1.jpg
img/sample-images/640px-Rafting_Zambezi.JPG
img/sample-images/640px-Regal_Cinemas_Imax_Theatre.jpg

img/sample-images/640px-Southwest_corner_of_Central_Park,_looking_east,_
NYC.jpg
img/sample-images/640px-The_Club_-_bar.jpg
img/sample-images/640x480_Hike.jpg
img/sample-images/800px-BarMaderaTenAireMX.jpg
img/sample-images/BikeTrail.JPG
img/sample-images/Golf_course,_Italy_-_20070620.jpg
img/sample-images/USA-NYC-Staten_Island_Ferry.JPG
js/Controls/ActivityListControl.js
js/ViewScripts/HomeView.js