thema + json history

thema veranderd + history
Merge branch 'master' of https://github.com/JannesV/cp3-eindopdracht-groep16

Conflicts:
	.idea/workspace.xml
	assets/sprites2x.xml
	out/production/Eindopdracht-CP3/Main.apk
	out/production/Eindopdracht-CP3/Main.ipa
	out/production/Eindopdracht-CP3/Main.swf
	src/be/devine/cp3/eindopdracht/Application.as
	src/be/devine/cp3/eindopdracht/components/Keypad.as
	src/be/devine/cp3/eindopdracht/model/AppModel.as
	src/be/devine/cp3/eindopdracht/view/Converter.as
	src/feathers/themes/ConverterTheme.as