Added FileDependency handling
Fixed missing annotation
Select Configuration provider via config-file.
Merge branch 'master' of https://github.com/tarator/AIC13G3P3.git
Merge branch 'master' into livedemo