Fixed imports in Oscillation.py
Merge branch 'master' into llr_optimizer_initial

* master:
  Fixed imports in Oscillation.py
Fixed missing datetime in Oscillations
Fixed call to AeffServiceMC
Make reco service input file a separate option (+ eliminate tab in .json)
Updated default PID settings with Tims version
Fix call of PIDServicePar in PID.py
Add reco event data as option, eliminate tabs
Make json return python string instead of unicode
Fix template make in standalone mode:
- select a hierarchy
- simply parameter handling
Fix boolean hierarchy flag
Merge commit 'e34f37556800afbca1e56cbdd2378d1b061107e2' into llr_optimizer_initial

* commit 'e34f37556800afbca1e56cbdd2378d1b061107e2':
  Changed aeff to have one default for V15
Cosmetic changes to params.py
Fixed merge conflicts in settings file