Backup Eclipse project files...
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	ShinyHeaven/.gitignore
formatting
DEBUG log level, formatting, remove preset charts as they can now be added
optimize imports