modified options, now should be more userfriendly
Merge branch 'master' of https://github.com/gpichon/caches-pfa

Conflicts:
	cassis/src/core/option.c