finalised ACP for 1.3
view layer 50% done
manual merge to dev
Merge branch 'v130' into dev
re-merging
Merge pull request #1 from Sajaki/dev

Dev merging