Add: email template for contact form for Contact Us.
Fix: language files, controller, view,  for Contact Us.
Merge branch 'master' of https://github.com/kiub/CodeIgniter-Bootstrap

Conflicts:
	application/controllers/contactus.php
Puto Git
øMerge branch 'master' of https://github.com/kiub/CodeIgniter-Bootstrap
Merge branch 'master' of https://github.com/kiub/CodeIgniter-Bootstrap
Merge branch 'master' of https://github.com/kiub/CodeIgniter-Bootstrap
Merge branch 'master' of https://github.com/kiub/CodeIgniter-Bootstrap
Merge branch 'master' of https://github.com/kiub/CodeIgniter-Bootstrap
Merge branch 'master' of https://github.com/kiub/CodeIgniter-Bootstrap
server change
Merge branch 'master' of https://github.com/kiub/CodeIgniter-Bootstrap
Fixing
...
Merge branch 'master' of https://github.com/kiub/CodeIgniter-Bootstrap
Merge branch 'master' of https://github.com/kiub/CodeIgniter-Bootstrap
Pull fix notification email template
Merge branch 'master' of https://github.com/kiub/CodeIgniter-Bootstrap
Merge branch 'master' of https://github.com/kiub/CodeIgniter-Bootstrap
Merge branch 'master' of https://github.com/kiub/CodeIgniter-Bootstrap
Merge branch 'master' of https://github.com/kiub/CodeIgniter-Bootstrap
rename paypal config file
merging repo