Add block settings in features export
Resolve conflicts among Features modules
Change package of config modules to IGLUG-Cal