Changed the password and username for the administration page.
Merge remote-tracking branch 'origin/master'

Conflicts:
	db.sqlite3
Changed the password and username for the administration page.