Pushed latest updates and new features

Currently pushed latest features and upgrades.
Merge remote-tracking branch 'origin/master'

Conflicts:
	database.sql