removing oauth requirement for now, pulling leaflet and jquery into local
adding leaflet dependencies
allowing js other than coffee generated, adding leaflet and jquery (both need updating to latest versions)
Merge branch 'master' of github.com:osmlab/maproulette

* 'master' of github.com:osmlab/maproulette:
  Fixed typo and began a welcome dialog box- currently unused
  Adding first stab at challenge selection dialog
  adding non null enforcements to model
  First crack at cleaning up the api using marshalling
  Modifying js to match server
  Fixing location field to be the location, not 'features'
  readding geojson module
  debugging
  debugging
  cleaning up and debuggin
  cleaning up
  First crack at admin code
  Loading sample data is really fun
  Fixing current_action property on tasks
  Adding NEARBUF to config
  Fixing logging import error
  Fixing KeyError exception when user is not logged in
  Changing the challenge_or_404 call to make it more explicit and fix some bugs
  Fixing stupid typo

Conflicts:
	maproulette/templates/index.html
Merge branch 'master' of github.com:osmlab/maproulette

* 'master' of github.com:osmlab/maproulette: (31 commits)
  housekeeping
  housekeeping
  housekeeping
  challenge/slug is working now
  debugging the challenge api
  commentary
  minor change in debug output
  consistent use of challenge slug representation, added some debug code for now
  added slug definition to challenge loader
  bumping flask-sqlalchemy to release version, being more lenient with versions where possible
  maproulette/static/js/mr-helpers.js
  Removing the stats from the template when there's no challenge loaded
  Moving notification code to its own file
  Moving just a few functions out of the mains script
  Fixed the geojson output
  Fixing my own stupidity
  adapted sampledata loader to model changes
  We need Action to load sample data
  reinstating location property name, changing column name to geom in task
  changing geometry types in model to emit and consume geojson, adapting views to match
  ...
added six to requirements