Merge branch 'develop' to fix license in README.md
Bump to 1.3.0-alpha1
API: Ensure Basic Auth API logs incoming login to assist debugging.
Bump to 1.3.0-alpha2
Version bump to alpha6
2-Step: Derpy Expiry field is actually creation date lulz!

Correct code so that we are actually storing the date when the
2-Step session expires and not when it was created.

Violating the rule of least surprise? What was I drinking that day
I wonder. I'm off to kick my own ass for this one.
csv: Figuring out which valid CSV line fails account create is hard

When CSV was supplied in valid form but was going to create duplicate
or otherwise invalid accounts per ManagedSubject validator the
resulting display for users was confusing and unhelpful.

This commit highlight the specific entry that was being rejected
along with why. We also provide an additional helpful pointer to the
possibility that the account being created is a duplicate as this is
the major reason CSV upload fails at this point.

Closes #168.
Merge pull request #166 from ausaccessfed/bugfix/#166-500-expired-account-login-with-two-step-configured

Accounts can get into an error state where they can no longer log in
ManagedSubject: Users get no notification of account being locked.

Users who lock their accounts with invalid password attempts (or
who have their accounts locked by someone trying to brute force) get
no notification in the Web UI that this has occured (by design).

However they should get some form of notice and explict details on
how to remedy the situation.

This commit introduces a new email that is sent to accounts which
are locked out due to multiple password failures and includes
contact information for group, organisation and AAF administrators
to assist them in resolving the problem.
Merge pull request #163 from ausaccessfed/feature/#163-send-email-on-deactivate

Send an email to a user when their account is deactivated by incorrect password attempts
ManagedSubject: Show dateCreated to administrators.

Adds Fixes for #164.
ManagedSubjectService: UI needs to show event on account finalization

Changes ManagedSubjectService and ManagedSubject to add an additional
event for publishing in the account UI when a user
finalizes their account.

This should aid AAF support in tracking key changes for user
accounts.

Closes #164.
Bump to 1.3.0-alpha1
API: Ensure Basic Auth API logs incoming login to assist debugging.
Bump to 1.3.0-alpha2
Version bump to alpha6
csv: Figuring out which valid CSV line fails account create is hard

When CSV was supplied in valid form but was going to create duplicate
or otherwise invalid accounts per ManagedSubject validator the
resulting display for users was confusing and unhelpful.

This commit highlight the specific entry that was being rejected
along with why. We also provide an additional helpful pointer to the
possibility that the account being created is a duplicate as this is
the major reason CSV upload fails at this point.

Closes #168.
version: 1.3.0-rc1
Merge branch 'release/1.3.0' of github.com:ausaccessfed/virtualhome into release/1.3.0

Conflicts:
	virtualhome/application.properties
version: 1.3.0-rc2 (incorrect merge resolution for rc1)