18:10 11/02/2014
Merge remote-tracking branch 'origin/clipit_befe' into clipit_befe

Conflicts:
	.gitignore