Can't even remember what I did. ::: User to application form.. fixed user/edit
Merge branch 'master' of https://github.com/blakeyoder/salk_app

# By Adam B. Underdown (5) and Clay White (2)
# Via Adam B. Underdown (1) and Clay White (1)
* 'master' of https://github.com/blakeyoder/salk_app:
  does this work now?
  made application forms/add go from 1943 to 2013
  fixed some application form stuff
  added pdf view link
  The PDF code that didn't push last time should be there now
  user view
  lots of PDF/forms things. Added PDF plugin and PDF views for each individual form. Also some user permissions for forms. Site director filtering is broken

Conflicts:
	app/Model/ApplicationForm.php