added DS_Store to gitignore
changed all Fairnopoly and fairnopoly strings to Fairmondo and fairmondo
Merge branch 'feature-rename' into develop

Conflicts:
	app/assets/images/apple_touch_icon.png
	app/assets/images/favicon.ico
	app/assets/images/sprites.png
	app/assets/images/sprites/logo.png
	app/assets/images/sprites/logo_small.png
	app/assets/images/touch_icon_ipad.png
	app/assets/images/touch_icon_ipad_retina.png
	app/assets/images/touch_icon_iphone_retina.png
	app/workers/file_normalizer_worker.rb