version 3.1.2
take in consideratin port number in the redirect done in BaseModel class
fix #705
issue #708 mini fix
Merge branch '708' into hotfixes
Merge branch 'hotfixes' into develop

Conflicts:
	oc-includes/osclass/upgrade-funcs.php