merged changes of templates from Django 1.7.x
using new options of AdminSite from Django 1.7.x
updating testing project for new Django version
small fixes in styles
version 1.7.0
Merge remote-tracking branch 'upstream/master'