line-up, publish, excluding log
Merge branch 'master' of https://github.com/MySmallfish/SAMS

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