When there's a prefix, table name escaping creates SQL error.
Merge pull request #1118 from jlewallen/develop

When there's a prefix, table name escaping creates SQL error.
Fix hidden location on reports detail page #1121
Merge branch 'develop' of git://github.com/ushahidi/Ushahidi_Web into develop
Set empty riverid when one is not supplied for new users.
Tidy up.
Create CONTRIBUTING.md
Update CONTRIBUTING.md
Update CONTRIBUTING.md

Remove RoR references
Change target URL for _check_for_clean_url() to one that actually exists.
Make nav helper more friendly and filterable for plugins and themes.
Merge pull request #1124 from solarissmoke/clean-url-bug

Cannot enable clean URLs from admin, _check_for_clean_url() always returns false.
Proper use of url::site(), clean up.'
Fix datepicker in default theme.

- Don't use mm/dd/yyyy format as this will be parsed inconsistently by PHP's
strtotime() depending on locale settings. Use ISO date format instead.

- Make sure the "This Week" quicklink works even if the week crosses into
  the following month.
Merge pull request #1125 from solarissmoke/filterable-nav

Make nav helper more friendly and filterable for plugins and themes.
Added the interarm theme
Merge branch 'riverid-bug' of git://github.com/solarissmoke/Ushahidi_Web into develop

Conflicts:
	application/models/user.php
incident_time should be double-digit.
Fix twitter test logic.
Don't upsize uploaded images.