line-up
Merge branch 'master' of https://github.com/MySmallfish/Simple.SAMS

Conflicts:
	trunk/src/SAMS/logs/SAMS.log.txt