Version bump to 1.3.0
updated gems
Merge branch '1.3'

Conflicts:
	Gemfile
	Gemfile.lock