switch to APIView to support url conventions

merged with master