Merge branch 'master' of github.com:appdrones/page_record

Conflicts:
	Gemfile.lock