Merge branch 'release-1.1'
Merge and remove moment-timezone coming back to haunt me.
Add bower and grunt-cli to package.json
Fix 404 by changing icon-font-path
Merge pull request #37 from bettse/master

Webui improvements
Add pre python 3.3 support to nzb template
Remove conflict lines from gitignore
Add pre python 3.3 support to api result template
Add favicon endpoint to api.py
Merge pull request #39 from bettse/bettse/gitignore_conflict

Remove conflict lines from gitignore
Merge pull request #41 from bettse/bettse/favicon

Add favicon endpoint to api.py
Merge pull request #40 from bettse/bettse/pre_py_33

pre python 3.3
Merge branch 'master' into development