Fannie develop

the only commit i was TRYING to push was this one: 
https://github.com/CORE-POS/IS4C/commit/af9e0c57bfff0354d5e1c2eae87ac4497c244d24