Modified again to use 'DROP TABLE IF EXISTS' so it won't fail the first time.  This change was made before.  I'm not sure how it got lost.
Merge branch 'master' of git://github.com/fluxtream/fluxtream-app
Merge branch 'master' of git://github.com/fluxtream/fluxtream-app
Merge branch 'master' of git://github.com/fluxtream/fluxtream-app
Merge branch 'master' of git://github.com/fluxtream/fluxtream-app
Merge branch 'master' of git://github.com/fluxtream/fluxtream-app
Merge branch 'master' of git://github.com/fluxtream/fluxtream-app
Merge branch 'master' of git://github.com/fluxtream/fluxtream-app
Merge branch 'master' of git://github.com/fluxtream/fluxtream-app
Merge branch 'master' of https://github.com/fluxtream/fluxtream-app
Merge branch 'master' of https://github.com/fluxtream/fluxtream-app
Merge branch 'master' of https://github.com/fluxtream/fluxtream-app
Merge branch 'master' of https://github.com/fluxtream/fluxtream-app
Merge branch 'master' of https://github.com/fluxtream/fluxtream-app
anne's fix with the export to csv button (this commit is aduplicate - can be ignored)
Merge branch 'master' of https://github.com/fluxtream/fluxtream-app
support old-style moves location uris
Merge remote-tracking branch 'origin/master'
be more robust against "segments" value
avoid trying to fetch storyline before the user's registration date