Merge branch 'master' of github.com:canadaduane/openagent

Conflicts:
	spec/sif/representations/xml/student_personal_spec.rb
Merge branch 'master' of github.com:canadaduane/openagent