Merge origin/serviceOrer1.0 into serviceOrer1.0

Conflicts:
	serviceOrderWeb/src/java/co/com/serviceorder/mbean/ProductViewMBean.java
Merge origin/serviceOrer1.0 into serviceOrer1.0

Conflicts:
	serviceOrderWeb/src/java/co/com/serviceorder/mbean/ProductViewMBean.java
Merge origin/serviceOrer1.0 into serviceOrer1.0

Conflicts:
	serviceOrderWeb/src/java/co/com/serviceorder/mbean/ProductViewMBean.java
desarrollo de login