Merge branch 'master' of github.com:amedia/checkpoint

Conflicts:
	Gemfile.lock