Merge branch 'master' of https://github.com/muichkine/simple_token_authentication

Conflicts:
	lib/simple_token_authentication/acts_as_token_authenticatable.rb