Merge branch 'hotfix/1.2.2'
Merge branch 'develop'
Moved the nested field template to app/views/applicaiton so that it is available globally
Removed the nested field template from app/views/users
Merge branch 'hotfix/1.2.3'
Merge tag 'v1.2.3' into develop

Finished fixing everything! HOPEFULLY