updated gems
updated gems and removed old generated controller specs..
Merge branch 'master' of https://github.com/Gynzy/assetfinder into rails4

Conflicts:
	Gemfile.lock