add Page Not Found
Merge branch 'master' into task-13

Conflicts:
	sites/all/modules/custom/tradexperts/tradexperts.module
fixed some problem
Merge pull request #16 from Sempay/task-13

Task 13