Renamed TimeSpanMap.java and TimeSpanSegment.java
Renamed TimeSpanMap.java and TimeSpanSegment.java
fixed a problem with passing ApiKey objects into GuestService APIs and modifying ApiKeyAttributes without first finding a fresh copy of the ApiKey object from JPA and operating on that
Merge branch 'development' of github.com:fluxtream/fluxtream-app into development