S
Merge branch 'master' of https://github.com/gob94/PolApp
Merge
Conflicts:
	gen/com/thinksoft/polapp/R.java
	src/com/thinksoft/businesslayer/bussinessmanagers/BusinessManager.java
	src/com/thinksoft/businesslayer/bussinessmanagers/impl/BusinessManagerImpl.java