setup asset_pipeline_i18n
Merge branch 'master' of github.com:hallgren/rails_asset_pipeline_i18n

Conflicts:
	.gitignore