fix FANN dependency error and some bugs
Merge branch 'trunk' of http://github.com/larlight/LArLight into trunk