Bug Fix Mac
Merge origin/master

Conflicts:
	.gitignore
	Gemfile.lock