initial raster upload support, manual content
(cherry picked from commit 2fb3620ea31364d3a99c2485693e8b830399f55e)

Conflicts:

	templates/upload/layer_upload.html
Fixes to the css that allow us to include other buttons in the
playback bar
(cherry picked from commit ddbd5a9197bb17b48dba841691742d5537c259d3)
Fix the button widths in the playback bar
(cherry picked from commit c9538e454ea763f874214680c0f69a3eb9896d84)
don't create action for annotations lyr, refs#629
(cherry picked from commit 6e18f7c053d28dfbd9647cc79e7d9fc304acfbfe)

Conflicts:

	social_signals.py
Added a edit mapstory link to the mapstory mapinfo page

Address #652
(cherry picked from commit ba41521cd0e47d30f8067a513df7dae969bcd430)
Addes a two new url that generate a "user report"

This commit add two new urls that allows superuser to export a list of
all the current users. This url generates a csv for now.
(cherry picked from commit ba11c86143f60adb6ca77330b1fdf8a9a34bc3f8)

Conflicts:

	admin.py
	urls.py
add activity report, minor rearrange from ba11c86
(cherry picked from commit 9002e7264685dadd013d0f016a12974bea476b4e)

Conflicts:

	urls.py
fix sort order in activity report
(cherry picked from commit 9f430837f56165c44d52a2974176f06a3f838830)
follow up to 8d2f5b4c - 2.6 compat
(cherry picked from commit 17472e7534b9f24d2a46b0c1fcd4c840aa057848)