User version name with function fixed
Merge branch 'rails4' of github.com:cirope/mawidabp into rails4

Conflicts:
	Gemfile.lock