Merge branch 'master' into develop
Merge branch 'master' of https://github.com/samba6/superlists
Merge branch 'master' of https://github.com/samba6/superlists
Merge branch 'master' into develop
Merge branch 'master' of https://github.com/samba6/superlists

Conflicts:
	deploy_tools/fabfile.py
Merge branch 'master' into develop
Changed item input box name and id.