View and Logs
merge
merge ?
Merge branch 'master' of https://github.com/Ydrasaal/jcsi_bonanza

Conflicts:
	JCSI/src/jcsi/bootstrap/Main.java
	JCSI/src/jcsi/exception/BadConfException.java