fixed the association and fixed the STRICT errors
Merge branch 'develop' of github.com:hrishikesh/relocate into develop