Trying to fix mssql sillyness
Merge branch 'master' of git://github.com/newicon/nii-core

Conflicts:
	config/Environment.php
	index.php