clean up
Merge branch 'dataCache' of https://github.com/dosimont/ocelotl into dataCache
Merge branch 'master' into dataCache

Conflicts:
	fr.inria.soctrace.tools.ocelotl.ui/src/fr/inria/soctrace/tools/ocelotl/ui/views/OcelotlView.java
First implementation of datacache rebuilding from dirty cache; implemented maximum cache size policy; replaced initialization by constants; separated interface element instantiation from listeners
Added cache deactivation option
Implemented second strategy (reconstructino from database) for matrix rebuilding
Added event query with multiple timestamp intervals implementation
optimized rebuilding; cleaned up Datacache
fixed bugs in datacache rebuilding; clean up
Implemented multi-time interval query for state
Fixed bug in matrix reconstruction
Change date format to be more readable
refactoring + fixed bug in event query
Added missing methods for Variable type
variable updated
Merge branch 'dataCache' of https://github.com/dosimont/ocelotl into dataCache
fixed database strategy for the state events; optimized proportional strategy by precomputing the proportion factors
Adapt database rebuilding for state events
fixed bug in rebuilding from cache; fixed bug in datacache identification
add snaphot and configuration features (issues #32 and #33)