guide or regular
Merge remote-tracking branch 'origin/master'

Conflicts:
	partials/table_users.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	partials/table_users.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	partials/table_users.html
Merge remote-tracking branch 'origin/master'
Alert messages
Merge remote-tracking branch 'origin/master'