Merge branch 'master' of /Users/arelisguerrero/WebstormProjects/pro-e-systems with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Fixed viewBussiness