Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/app/mainMenu.zul

src/main/webapp/app/search/searchForm.zul

@@ -18,7 +18,7 @@
                     <vbox>
                         <image src="/img/lucene_logo.png"/>
                         <hbox>
-                            <textbox value="@bind(vm.keyWord)" instant="true" width="250px"
+                            <textbox value="@bind(vm.keyWord)" instant="true" width="250px" onCreate="self.setFocus(true)"
                                      onOK="@command('doSearch')"/>
                             <button label="${labels.Search}" onClick="@command('doSearch')" sclass="nicebutton"
                                     image="/img/search.png"/>

src/main/webapp/main/invoicing/invoicingForm.zul

@@ -1,4 +1,4 @@
-<?page title="${labels.Invoicing}" contentType="text/html;charset=UTF-8"?>
+<?page contentType="text/html;charset=UTF-8"?>
 <zk>
 	<window
 		id="editWin"
@@ -14,15 +14,17 @@
 			zclass="form-caption"
 			label="${labels.InvoicingFormTitle}" />
 		<vlayout vflex="1">
-			<hbox>
-			
-			<vbox height="300px">
+			<hbox
+				vflex="min"
+				hflex="1">
 				<button
 					image="/img/item-add.png"
 					label="${labels.InvoicingAdd}"
 					sclass="nicebutton"
 					onClick="@command('addItem')" />
-				
+			</hbox>
+			<hbox vflex="1">
+				<vbox vflex="1">
 					<listbox
 						model="@load(vm.dataBean.items)"
 						vflex="1"
@@ -65,13 +67,15 @@
 										onChange="@command('calculate')" />
 								</listcell>
 								<listcell>
-								<button label="${labels.RemoveItem}" sclass="nicebutton" onClick="@command('removeItem', item=each)"/>
+									<button
+										label="${labels.RemoveItem}"
+										sclass="nicebutton"
+										onClick="@command('removeItem', item=each)" />
 								</listcell>
 							</listitem>
 						</template>
 					</listbox>
 				</vbox>
-			
 				<grid hflex="min">
 					<columns>
 						<column
@@ -125,11 +129,7 @@
 						</row>
 					</rows>
 				</grid>
-			
-			
-			
 			</hbox>
-			
 			<listbox
 				vflex="1"
 				model="@load(vm.dataBean.requirement.items)">
@@ -198,7 +198,6 @@
 					</listitem>
 				</template>
 			</listbox>
-			
 			<include src="/app/formButtons.zul" />
 		</vlayout>
 	</window>