Merge branch 'dev' of https://github.com/grnet/flowspy into dev
Conflicts: ChangeLog _version.py doc/index.md flowspec/models.py flowspec/views.py flowspy/settings.py.dist
docs
Updates for v1.1.1
add markdown documentation
update docs
Minor doc fixes
Minor doc configuration fix
Minor documentation fix
Update version and documentation
Release version 1.0.3
Documentation enhancements
Minor fixes. New stable version
Update docs for a new release
Minor fixes in documentation regarding celery
Fix in docs
Update installation instructions with apache site activation
More doc updates
Add missing line in docs
Update with celeryd instructions
Update documentation
Re-wrote installation documentation for Ubuntu 12.04.3