organized the project folders
Merge branch 'alan' into develop

Conflicts:
	WebApplication1/WebApplication1/app/cardsControllers.js