Merge branch 'wordpress' into devel
remove hashbang from angular routing
add compiled sass stylesheets
Merge branch 'devel'