Merge origin/master

Conflicts:
	nbproject/faces-config.NavData
	src/java/com/controller/ExpenseLineController.java
	web/expenseLine/Create.xhtml