Merge branch 'master' of https://github.com/easysoft/zentaopms

Conflicts:
	module/build/view/linkbug.html.php
	module/build/view/linkstory.html.php
	module/project/view/create.html.php
	module/release/view/linkbug.html.php
	module/release/view/linkstory.html.php

module/project/view/create.html.php

@@ -138,7 +138,14 @@
           <td colspan='3'><?php echo html::checkbox('whitelist', $groups, $whitelist, '', '', 'inline');?></td>
         </tr>
         <tr>
+<<<<<<< HEAD
           <td colspan='4' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', 'btn btn-wide');?></td>
+=======
+          <td colspan='4' class='text-center'>
+            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::backButton('', '', 'btn btn-wide');?>
+          </td>
+>>>>>>> d31cb467eea5b5badeb0fe21a7c21ac7e1b3b15e
         </tr>
       </table>
     </form>