All js and css saved local.
Merge remote-tracking branch 'origin/master'

Conflicts:
	dbdump.sql