Merge pull request #4 from osu-mist/feature/tasx-11-test-user

Feature/tasx 11 test user
Merge pull request #5 from osu-mist/tasx-15-validate-email

Tasx 15 validate email
store password hash after validation

tasx-10
Merge branch 'develop' of github.com:osu-mist/tasx into develop

Conflicts:
	grails-app/domain/edu/oregonstate/mist/User.groovy
	test/unit/edu/oregonstate/mist/UserSpec.groovy
Merge commit '44736b7' into feature/tasx-18-redo-merge

tasx-18

Conflicts:
	grails-app/domain/edu/oregonstate/mist/User.groovy
	test/unit/edu/oregonstate/mist/UserSpec.groovy
refactor user test constants

tasx-18
refactor task test members

tasx-18
refactor interval test constants

tasx-18
Revert "Merge branch 'develop' of github.com:osu-mist/tasx into develop"

This reverts commit 087045b5369bdf0079d2ed0acc9ee2f03de2d8bb, reversing
changes made to 1053c91369f56cf0e6ab2141e0409a0ef30b3035.
Merge branch 'feature/tasx-18-redo-merge' into develop

Conflicts:
	grails-app/domain/edu/oregonstate/mist/User.groovy
	test/unit/edu/oregonstate/mist/TaskSpec.groovy
	test/unit/edu/oregonstate/mist/UserSpec.groovy
Merge branch 'develop' into feature/tasx-16-subtasks

Conflicts:
	test/unit/edu/oregonstate/mist/TaskSpec.groovy