Added bolt::amp::merge
Inner product - partial
Merge branch 'develop' of https://github.com/HSA-Libraries/Bolt into amp-func-develop
vs 12 build fix
Merge branch 'develop' of https://github.com/HSA-Libraries/Bolt into amp-func-develop
Inner Product AMP code added