Resolves #1 ViewModels Refactoring
Merge branch 'master' of https://github.com/nramirez/VADS into nramirez-master

Conflicts:
	VADS/VADS/VADS/VADS.csproj