Merge branch 'master' into production

Conflicts:
	makefile
production: added alot more new aliaseswq
Update mysql/my.cnf
Merge branch 'custom' into production

* custom:

Conflicts:
	makefile
production: more updates
Merge branch 'production'

* production:
  production: more updates
  Update mysql/my.cnf
  production: added alot more new aliaseswq