Clean up
Data
Added:REAME
Fix:Config+Added Main
Added:Activation Fn
Fix:CONFIG
Fix:CNN
Fix:minor
Merge branch 'master' into devel

Conflicts:
	utils/load_conf.py