add travis ci config file
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/MeeGL/CommonGL.cpp
	src/main.cpp