Ape.umbraco v2

Merging v2 into master.