Switchted the addressshort code to two views: inline and block due to hard to maintain code logic
Merge branch 'master' of https://github.com/sylverios/dwh_skeleton