views
Merge branch 'master' of https://github.com/crystal-ds/crystal-server.git

Conflicts:
	src/main/java/org/mitre/crystal/model/InputType.java
Merge branch 'master' of github.com:crystal-ds/crystal-server
updated models to new input types. Removed old inputTypes