All Modules Merged and Tested Successfully
Fixed Merging Problem with Remarks
Fixed merging problem with remarks
Updated To v1.1-162-ge64d6a3 20140121
Merged With All Module together Finally

Conflicts:
	lib.inc.php