# Conflicts:
#	.gitlab-ci.yml
#	db/migrate/20161007073613_create_user_activities.rb
#	db/post_migrate/20161128170531_drop_user_activities_table.rb

[ci skip]