Upgrade ruby version to 2.1.1.
Upgrade rails to version 3.2.17.
Merge branch 'feature/upgrade-gems' into develop
Remove x86-mingw32 gems from Gemfile.lock.
Merge branch 'release/1.1.3' into develop
Merge branch 'release/1.1.3'
Merge branch 'master' into custom

Conflicts:
	Gemfile.lock
Remove precompiled assets.
Remove @extend directives from custom.css.scss.
Merge branch 'release/1.1.4'
Merge branch 'master' into custom
Precompile assets.