Automated merge with http://bitbucket.org/ovidiu/conflexplore/
Automated merge with http://bitbucket.org/ovidiu/conflexplore/

cosminn777/openfca,cosminn777/openfca,cosminn777/openfca,cosminn777/openfca