add "advanced" button to the new_rules form
fix some js
Merge pull request #11 from pgolm/feature/rules-form

fix some js
add: bootstrap3 & fixed jquery resolution
Merge branch 'master' into feature/newUI
fix ldap autodiscover in production/staging
add owner2
Merge remote-tracking branch 'zimk/master' into feature/owner2

Conflicts:
	fwadmin/tests/test_views.py
first ui improvements
Merge remote-tracking branch 'zimk/master' into feature/owner2

Conflicts:
	fwadmin/tests/test_views.py
add owner2 tests
Merge branch 'feature/owner2' of github.com:mvo5/fwadmin into feature/owner2

Conflicts:
	fwadmin/tests/test_views.py
	fwadmin/views.py
fix merge artifact
fix another merge artifact
Merge branch 'master' into feature/rules-form
Merge remote-tracking branch 'pgolm/feature/newUI' into feature/rules-form

Conflicts:
	fwadmin/templates/fwadmin/new_rule.html
Merge branch 'feature/rules-form' of github.com:mvo5/fwadmin into feature/rules-form
add quick buttons
do not hardcode the "quick buttons" in the template
move quickButton code around a little bit