Merge branch 'master' of https://github.com/pohuigin/smart_library

Conflicts:
property_modules/ar_posprop.pro
wtf so confused