final changes
Merge branch 'master' of https://github.com/bosasateam/TrustMasterBI.git
28-02-2013