Merging veritrans-2 branch to vtweb-2 branch

Merging veritrans-2 branch to vtweb-2 branch, mainly for adding proper Veritrans 2.0 support