some osx improvments
some osx shader cleanups
osx build and fixing
Removed semicolons in main() function
Merge branch 'master' of https://github.com/ppiecuch/AwesomeBump into ppiecuch-master

Conflicts:
	CommonObjects.h
	content/filters.frag
	content/filters.vert
	content/plane.frag
	content/plane.vert
	glimageeditor.cpp
	glimageeditor.h
	glwidget.cpp
	main.cpp
	mainwindow.cpp
	mainwindow.h
deleted unnecesary file
Merge branch 'ppiecuch-master'
OSX improments