Merge remote-tracking branch 'origin/master'

Conflicts:
	JobOrNot Front-End/mainpage.html
Merge remote-tracking branch 'origin/master'