Merge remote-tracking branch 'origin/stock-module' into stock-module
Merge branch 'develop' of github.com:TheKojuEffect/OpERP into stock-module
Create EditStock panel,models  and its controller
Bean Creation and Defination for EditStock
Add validation and exception functionalities
Remove itemWarehouseexists Exception
Add methods for imageResizing and setting button size
Add Icons to the buttons of stock management panes
Add Resources: Icons for buttons
Fetch product categories Eagerly

OPEN - task 24: Create a stock module 
http://github.com/DevOpsDistilled/OpERP/issues/issue/24
Fix #61 by eagerly fetch categories

Merge branch 'iss61-product-categories-lazy-init'
Merge branch 'iss61-product-categories-lazy-init' into develop
Set grow=false for Categories display column
Minor Changes: ProductDetails Layout

Merge branch 'develop'
Merge pull request #75 from TheKojuEffect/master

Display Categories of Product in ProductDetails correctly
Merge branch 'master' into stock-module

Conflicts:
	OpERP/src/main/java/devopsdistilled/operp/client/context/stock/MvcControllerContext.java
	OpERP/src/main/java/devopsdistilled/operp/client/context/stock/MvcModelContext.java
	OpERP/src/main/java/devopsdistilled/operp/client/stock/StockMgmtPane.java
	OpERP/src/main/java/devopsdistilled/operp/client/stock/controllers/impl/StockControllerImpl.java
	OpERP/src/main/java/devopsdistilled/operp/client/stock/panes/controllers/impl/UpdateStockPaneControllerImpl.java
Solve merge conflicts
Add RMI Properties to externalize settings
Create rmiUrl field to be used by *RmiContext
Extend RmiContext and use rmiUrl field