Updates
Merge branch 'master' of https://github.com/brndnthai/plantivity
Merge branch 'master' of https://github.com/brndnthai/plantivity
Removed settings.py from the git
Merge branch 'master' of https://github.com/brndnthai/plantivity
Added settings to gitignore
Agh
Merge branch 'master' of https://github.com/brndnthai/plantivity

Conflicts:
	plantivity/apps/plantivity_core/templates/findactivity.html
	plantivity/settings.py
bloop
Merge branch 'master' of https://github.com/brndnthai/plantivity
Merge branch 'master' of https://github.com/brndnthai/plantivity
bloop
Merge branch 'master' of https://github.com/brndnthai/plantivity