Merge branch 'master' of https://github.com/MCFAD/oxylyzer

Conflicts:
Oxylyzer/src/com/mcfad/oxylyzer/HistoryFragment.java
Oxylyzer/src/com/mcfad/oxylyzer/RealtimeFragment.java
solving conflicts
solving conflicts