Commiting changes from merge
Merge branch 'cidster' of https://github.com/jgimbel/SEfall2013 into cidster

Conflicts:

SoftwareEngineering/target/m2e-wtp/web-resources/META-INF/maven/edu.ucol
lege/tech/pom.properties