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 branch 'master' of https://github.com/leifos/ifind
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