changed the local settings
removed .htaccess from git
it has local settigns
cleanup
.gitignore
Merge branch 'production' of github.com:newdynamx/trx into sdwalden

Conflicts:
	.htaccess
	app/load/index.php
	app/oauth/index.php
	index.php
	lib/database/mysqli.php
	sql/s_products.sql
load index.php
Merge branch 'master' of github.com:newdynamx/trx into sdwalden

Conflicts:
	.gitignore
	app/load/index.php
merge