Merge branch 'release/1.0.2' into develop
version is now "dev" again
fixing version to be pep386 compliant for dev version
Merging in pull request #3
adding in a changelog
adding in a jenkins script
Removed recommendation to include 'from .urls import urls' from __init__.py, as it had the potential to cause strange import ordering behaviour with Django. Although 'appname.urls.urls()' is a bit uglier when including in a urlpatterns list, it's more explicit and less fragile.
Bumping version number to 1.2
reverting confusion related to version number
updating to use latest django minor releases on travis
setting django version dependency to be >=1.3
Merge branch 'develop'