/all kinds of stuff… broke the damn cal somehow
Merge branch 'server'

# By Clay White (2) and blakeyoder (2)
# Via blakeyoder
* server:
  This has the fix in it from the View breaking when a user tried to view his profile. Its a minor change.
  Terminates user session after a specified amount of time (30 minutes)
  fixed User associations bug and added views for Questionnaire Form that we must have missed earlier
  updated Camps / Users associations to make it easier to assign camp director
Merge branch 'master' of https://github.com/blakeyoder/salk_app

# By Alex S. Valis
# Via Alex S. Valis (1) and blakeyoder (1)
* 'master' of https://github.com/blakeyoder/salk_app:
  Bootsrap integrated and a few views have been edited. We should be pushing new views pretty frequently