Merge pull request #4 from ua-eas/development

Merging development branch to master with latest changes
Updated feature file
Update Aug. 23, 2013
initial commit of Create and finalize new award
Updated to remove extra column in Budget periods table
Updated ununcommented feature file
removing award feature file from master. This is not done yet.

We only want tests in master that are completely done.
Merge branch 'refs/heads/master' into development
Merge branch 'development' of github.com:ua-eas/katt-kaiki-features into development

Conflicts:
	features/kuali-coeus/create_and_submit_proposal_basic.feature