Merge branch 'fannieDevelop' of https://github.com/CORE-POS/IS4C into fannieDevelop

Conflicts:
	.travis.yml
Merge branch 'fannieDevelop' of https://github.com/CORE-POS/IS4C into fannieDevelop
Merge branch 'fannieDevelop' of https://github.com/CORE-POS/IS4C into fannieDevelop

Conflicts:
	.travis.yml
BUGFIXES in Member status module