git cleanup
git cleanup
Merge branch 'master' of http://github.com/edgd1er/M1S1_INFO

Conflicts:
	S1_ASE/ASE_MEM01/test
	S1_ASE/ASE_MEM03/include/mmu_manager.h
	S1_ASE/ASE_ORDO4/pingpong
	S1_ASE/ASE_ORDO4/prodcons