building next begin fixing bug
Merge branch 'development' into staging
fixed typo in splash
Merge branch 'development' into staging