merge with master
Merge branch 'master' into aquarium
Conflicts: snf-astakos-app/Changelog snf-astakos-app/README snf-astakos-app/astakos/im/api.py snf-astakos-app/astakos/im/backends.py snf-astakos-app/astakos/im/context_processors.py snf-astakos-app/astakos/im/functions.py...
merge with master: fix conflicts
Updated styles
integration with aquarium: Progress III & merge master
Refs: #1824
Better signup button below the login form
Repo refactor and webproject hooks fixes