Development branch refactored(P1)
Merge branch 'development' into development_refactored_16042014