Merge branch 'aaron' of github.com:Aloja/aloja into histograms_screen
Merge branch 'histograms_screen' into aaron
Changed menu and added reference items
Merge remote-tracking branch 'origin'