Merge remote-tracking branch 'origin/master'

# Conflicts:
#	public/themes/default/views/app/recruit/sign_up.blade.php