Merge pull request #1 from jesserosato/master

Update
Merge branch 'master' of https://github.com/jesserosato/jaams-web
Middle of working on Forms processing.
Merge branch 'master' of https://github.com/Terrell707/jaams-web into Adrian_4-17-13
Done some stuff
Working commit.
Removed .DS_Store
Merge branch 'master' of https://github.com/Terrell707/jaams-web into Adrian_4-17-13

Conflicts:
	core/Documentation/JAAMS_MVC.png
	forms/Documentation/JAAMSForms_MVC.png
	forms/README.md
	forms/default_templates/default-group.template.php
	forms/default_templates/default-inputs.template.php
	forms/models/.DS_Store
	index.php
Merged with Adrian's changes.
Merging working commit.
Merge working branch.