Updated the
Updated the
Updated the
Merge branch 'master' of https://github.com/leifos/ifind

Conflicts:
	applications/rmiyc_project/rmiyc/views.py
Merge branch 'master' of https://github.com/leifos/ifind

Conflicts:
	applications/rmiyc_project/rmiyc/views.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	applications/rmiyc_project/profiles/__init__.pyc
	applications/rmiyc_project/profiles/urls.pyc
	applications/rmiyc_project/profiles/views.pyc
	applications/rmiyc_project/rmiyc/views.py