Fixed the project definition.
Merge remote-tracking branch 'upstream/master' into jp361
Rewriting the iSENSE_API to use iOS5
Fixed silly merge conflicts
Cleaned up git
Mike should stop pull requesting
Cleaned up files and started adding libraries
Set up external library for testing login
Skeletal manual view layout with non-interupting scrollview and dismissable keyboards
Merge pull request #405 from jaypoulz/jp361

Jp361 -- Made mostly git changes and librairy changes
Added global StringGrabber object with getString function to mimic Android's getString
Skeleton for using camera
Merge pull request #406 from stowellm/ms400

 Skeletal manual view layout with non-interupting scrollview and dismi… 
Hardcoded automatic strings, wrote concatenate method, wrote some media-taking code
Wrote string concatenation method, added Manual menu
Yay stuff works. Now Mike can try to break my API login
Merge pull request #407 from stowellm/ms400

String concatenation and Manual Menu
Mike you suck
Merge pull request #408 from jaypoulz/jp361

Jp361 -- Mike you still suck
added simple field matching