after the merging done in local machine
Merge branch 'master' of https://github.com/vishnudevk/onlineKada.git

Conflicts:
	src/com/onlinekada/bean/MasterBean.java
merged local