updated gitignore for codeigniter
fitting for deployment
updated some config
config for mod_rewrite
Just some colored boxes
Mkip1erge remote-tracking branch 'origin' into nils

updated nils branch
Merge branch 'master' into nils
just a test commit
.htaccess added mockup exclude
Merge remote-tracking branch 'origin/master' into robin