Merge branch 'release/2014.04.11.0' into develop
Merge branch 'hotfix/2014.04.11.1' into develop
Merge branch 'hotfix/2014.04.11.2' into develop
Merge branch 'hotfix/2014.04.11.3' into develop
Merge branch 'hotfix/2014.04.11.4' into develop
Conversion to Flask-Velox
Minor bug tweaks for velox
Relative url path for admin login
Updated velox version
Merge branch 'feature/velox-integration' into develop
Updated changelog
Version bump / Changelog update
Merge branch 'release/2014.04.25'