ILS7.0
ILS Upgrade to NAV 2013 R2

Conflicts:
	Codeunit/Codeunit_0000000012.txt
	Codeunit/Codeunit_0000000080.txt
	Codeunit/Codeunit_0000000414.txt
	Page/Page_0000000021.txt
	Page/Page_0000000042.txt
	Page/Page_0000000043.txt
	Page/Page_0000000344.txt
	Table/Table_0000000017.txt
	Table/Table_0000000021.txt
	Table/Table_0000000036.txt
	Table/Table_0000000037.txt
	Table/Table_0000000081.txt
	Table/Table_0000000112.txt
	Table/Table_0000000113.txt
ILS1.04 Upgrade to NAV 2013 R2 and merged Hotfixes from prior versions.
ILS merge

Conflicts:
	Codeunit/Codeunit_0000000012.txt
	Codeunit/Codeunit_0000000080.txt
	Codeunit/Codeunit_0000000414.txt
	Page/Page_0000000021.txt
	Page/Page_0000000042.txt
	Page/Page_0000000043.txt
	Page/Page_0000000132.txt
	Page/Page_0000000344.txt
	Table/Table_0000000021.txt
	Table/Table_0000000036.txt
	Table/Table_0000000037.txt
	Table/Table_0000000081.txt
	Table/Table_0000000112.txt
	Table/Table_0000000113.txt
ILS post-merge import, compile, export