Merge pull request #1 from ComputerVisionLab/master

update from master
update from master
json writer and reader implementation
Merge branch 'master' of https://github.com/darioaugusto/interimage-3

Conflicts:
	interimage-core/src/main/java/br/puc_rio/ele/lvc/interimage/core/Example.java
	interimage-core/src/main/java/br/puc_rio/ele/lvc/interimage/core/datamanager/AWSSource.java
	interimage-core/src/main/java/br/puc_rio/ele/lvc/interimage/core/datamanager/DataManager.java
	interimage-core/src/main/java/br/puc_rio/ele/lvc/interimage/core/datamanager/Source.java
	interimage-core/src/main/java/br/puc_rio/ele/lvc/interimage/core/operatorgraph/PigParser.java
	interimage-core/src/main/java/br/puc_rio/ele/lvc/interimage/core/project/Project.java
	interimage-core/src/main/java/br/puc_rio/ele/lvc/interimage/core/ruleset/RuleSet.java
Merge pull request #4 from darioaugusto/master

json stuff