Valama: Added bookmark-like display of current source file (Not completed yet)
Merge branch 'master' of https://github.com/Valama/valama

Conflicts:
	guanako/guanako.vala