Dev Version

new changes as on status of 5th March 2014
New changes

before client meeting
same as old