Merge branch 'master' of git.framasoft.org:Sangfroid/ChronoCheckMate

Conflicts:
	chronoCheckMate.pro.user

chronoCheckMate.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by Qt Creator 2.4.1, 2015-07-27T06:56:46. -->
+<!-- Written by Qt Creator 2.4.1, 2015-07-27T07:05:38. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>