Merge remote-tracking branch 'origin/master'

# Conflicts:
#	omod/src/main/java/org/openmrs/module/smartonfhir/web/filter/CORSFilter.java

Author: theanandankit

omod/src/main/java/org/openmrs/module/smartonfhir/web/filter/CORSFilter.java

@@ -28,16 +28,16 @@ public class CORSFilter extends OncePerRequestFilter {
 	protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
 	        throws ServletException, IOException {
 		// CORS "pre-flight" request
-		
+
 		response.addHeader("Access-Control-Allow-Origin", "*");
-		
+
 		if ("OPTIONS".equals(request.getMethod())) {
 			response.addHeader("Access-Control-Allow-Credentials", "true");
 			response.addHeader("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE");
 			response.addHeader("Access-Control-Allow-Headers", "Authorization");
 			response.addHeader("Access-Control-Allow-Headers", "Content-Type");
 			response.addHeader("Access-Control-Max-Age", "600");
-			
+
 			response.setStatus(HttpServletResponse.SC_OK);
 			return;
 		}