Merge github
adding trade
Merge
Changes
Merge
Merge github
github merge
Github merge
Github merge
Fixes
Merge
Merges
Login redirection
Merge remote-tracking branch 'origin/master'

Conflicts:
	adava/include/login_check.php
	adava/login.php