0.4.0_[2014-12-02.164623]
0.4.0_[2014-12-02.164623] (reverted from commit a69915cc057204afa1ff611e5763490fb1075de5)
Merge remote-tracking branch 'origin/master'

Conflicts:
	NEWS
	R/plot_AbanicoPlot.R
	R/plot_Histogram.R
	R/plot_RLum.Analysis.R
	inst/NEWS.Rd
	man/calc_Statistics.Rd
	man/plot_AbanicoPlot.Rd
	man/plot_Histogram.Rd
	man/plot_RLum.Analysis.Rd