fixed bug at new registration
Merge branch 'development' into development_refactored_16042014