Merge branch 'master' into taVideoThread

Conflicts:
	libs/PhVideo/PhVideoEngine.h

[ci skip]
restore bootstrap.sh for simple linux travis
add flowdock notifications
fix bootstrap.sh path
enable travis linux
moving text in GraphicTest
Merge branch 'master' into mdTravisLinux

* master:
  moving text in GraphicTest
  add flowdock notifications
pyenv installation in macos section
sudo pip install cpp-coveralls
check qmake version
add doxygen and uncrustify
disable uncrustify
fix macos sdl installation
better generate dialog
add space between text generate param
Merge branch 'mdTravisLinux'
secure flowdock notification
fix doxygen
fix uncrustify
fix #106