manually merged
Now returning database record ID in the JSON response payload for Fluxtream Capture upload.  Also fixed the update so that tags/comments are updated upon reupload.
Removed unnecessary TODO
Changed tags.all query to return a user's tags in sorted order.
manually merged
Deprecated the old API method for getting user tags.
Added SQL to create an index for the guestId field in the Tags table
Now ignoring comments and tags field when doing an Fluxtream Capture upload update.  Clients needing to change comments/tags for a Fluxtream Capture photo that's already been uploaded should use the metadata set method instead.
Fixed typo
Removed obsolete TODOs
Added facet metadata get and set methods

Resolved Conflicts:
	fluxtream-core/src/main/java/com/fluxtream/api/BodyTrackController.java
	fluxtream-core/src/main/java/com/fluxtream/connectors/dao/FacetDao.java
	fluxtream-core/src/main/java/com/fluxtream/connectors/dao/JPAFacetDao.java
	fluxtream-core/src/main/java/com/fluxtream/domain/AbstractFacet.java
	fluxtream-core/src/main/java/com/fluxtream/services/impl/ApiDataServiceImpl.java
	fluxtream-core/src/main/java/com/fluxtream/services/impl/PhotoServiceImpl.java
setFacetMetadata() now returns a 400 Bad Request if both comment and tags are null.