first day
final changes for 12
Merge branch 'lakshman' of https://github.com/VJ-Point-Of-Sale/bootstrapped into lakshman