indent
Merge branch 'master' of github.com:BryanApellanes/Core

Conflicts:
	Templates/Mvc4WithDao/Scripts/.idea/workspace.xml