Merge pull request #23 from mvo5/hotfix/fix-template-merge-artifact

fix merge artifact
add missing </div> and fix indent in index.html
auto-generate secret once instead of leaking it into the VCS
Merge pull request #25 from mvo5/feature/html-index-fixes2

add missing </div> and fix indent in index.html
make secrets.txt creation part of the first time init as it needs to created as the django-app user, not as www-data
ensure the cmd has no stderr output (indicates a error in the find expressio) and fix the find expression
add a "canary" into the test to ensure we run pyflakes
add py2.6 compat check_output (to still run on lucid if needed)
add missing first_time_init.py for travis
Merge pull request #26 from mvo5/hotfix/fix-secret-leaking

Hotfix/fix secret leaking
Merge branch 'hotfix/fix-secret-leaking' into bugfix/pyflakes-robustness
fix silly typo
Merge pull request #27 from mvo5/bugfix/pyflakes-robustness

Bugfix/pyflakes robustness
update bower file and dependencies
Merge pull request #29 from pgolm/feature/updateBower

update bower file and dependencies
- bower.js must be bower.json
- bootstrap.css 2.3.1 are not in the bower-repos -> back to the previous version (2.1.1)
* remove the modal dialog, because its looking ugly
* add back button to new rule dialog
Merge pull request #30 from pgolm/hotfix/fixBower

Broken bower deps
Merge pull request #31 from pgolm/feature/killtheModal

No modal window
Merge remote-tracking branch 'zimk/master'