Mearge for update
Mearge for update
Merge for update
Merged master fixed conflict.
Merge branch 'development' of http://github.com/open-integer/integer into development
Mearge for update.
Merge branch 'development' of http://github.com/open-integer/integer into development
Merger for update.
Merge branch 'development' of http://github.com/open-integer/integer into development

Conflicts:
	server/src/main/java/edu/harvard/integer/service/yaml/YamlManager.java
Merge branch 'development' of http://github.com/open-integer/integer into development
Add more technology yaml and add categories IPv4, Topology.