- added "object" as an equivalent to "module"
- added "object" as an equivalent to "module"


lrytz/scala,lrytz/scala,shimib/scala,felixmulder/scala,jvican/scala,scala/scala,lrytz/scala,shimib/scala,slothspot/scala,scala/scala,martijnhoekstra/scala,jvican/scala,lrytz/scala,martijnhoekstra/scala,jvican/scala,slothspot/scala,scala/scala,scala/scala,felixmulder/scala,slothspot/scala,martijnhoekstra/scala,martijnhoekstra/scala,shimib/scala,felixmulder/scala,jvican/scala,martijnhoekstra/scala,jvican/scala,shimib/scala,felixmulder/scala,shimib/scala,slothspot/scala,scala/scala,jvican/scala,scala/scala,felixmulder/scala,felixmulder/scala,martijnhoekstra/scala,lrytz/scala,slothspot/scala,slothspot/scala,felixmulder/scala,lrytz/scala,shimib/scala,jvican/scala,slothspot/scala