Merge pull request #1 from nabilzaini/master

To Merge
Form View done
Form View done
Fix conflict
Merge pull request #4 from webNeat/master

Form done