Merge pull request #3 from ZIMK/master

sync
porting to django 1.5
fix: backward compatible to django 1.4
change: django version in README [ci skip]
remove reduantant bit in README.md
do not pass instance=host to NewRuleForm() - that was rather silly
fix typo in delete_rule form, we need tests for click targets in the templates really
Merge pull request #4 from ZIMK/master

sync
merge with master
solve merge conflict
Merge pull request #15 from mvo5/fixes

two small fixes
Merge pull request #14 from pgolm/django1.5

porting to django 1.5
merged from master
Merge remote-tracking branch 'zimk/master'
Merge pull request #5 from ZIMK/master

sync
fix: ui improvements - navbar on top
Merge remote-tracking branch 'pgolm/layoutUseability'