commented out stuff on user_controller
Merge branch 'working_11_06_13' of https://github.com/penabianca/ImagineWare into working_11_06_13