Users can give apps additional permisions if they want
Associations created between refresh token and access token
Merge branch 'API_mainfest' of https://github.com/Immanent/diaspora into iapimain

Conflicts:
	app/models/dauth/refresh_token.rb