Remove sass-rails version restriction
Rails 4.1.5
More _accurate_ model test template
Merge ../x0y0 into tags

Conflicts:
	Gemfile.lock