Merge commit 'e1efbefb' into develop (bring develop up to date with pull #954). - www - Unnamed repository; edit this file 'description' to name the repository.

commit 05d2a862d5cde66de0edd744fcd782f6f152ff9c
parent fa9fd91dcbfdea5c3f807acef1528b00880d8a5e
Author: Davide P. Cervone <dpvc@union.edu>
Date:   Wed, 31 Dec 2014 17:08:14 -0500

Merge commit 'e1efbefb' into develop (bring develop up to date with
pull #954).

	www Unnamed repository; edit this file 'description' to name the repository.
	Log \| Files \| Refs \| README \| LICENSE