Adding basic general info
Merge branch 'f_general_info' into develop