Revert:
Merge remote-tracking branch 'origin/master'

Conflicts:
	logs/application.log
Merge remote-tracking branch 'origin/master'
Revert: