added expiring dates to tokens for activation and reseting password
changed activation url to get the key as a GET parameter
Merge branch 'development' of github.com:ging/horizon into design
refresh